merge trunk
authorKenichi Handa <handa@m17n.org>
Sat, 19 May 2012 11:47:40 +0000 (20:47 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 19 May 2012 11:47:40 +0000 (20:47 +0900)
commit24e5da62ad36972b68cd080f809d72a80b742c24
tree9b6438fe8ba8cbce54caf632b9a8274e58c2ab35
parent066c7c8ee3866c159b07239d9dce5c141938dfee
parentd59f000a1bdb54bdfeea3de1ea47e20cff201772
merge trunk